Move 'functions' to tools. More release Makefile tweaks.

diff --git a/Makefile.in b/Makefile.in
index eabcae40c8058ec30df8b181d5fd31104bfaa509..aee46dc63ec5bc42ef0e7cf003bfe441f21b1983 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,8 +167,9 @@ release-sourcecheck:
        make clean
        rm -fr gpsbabel-$(VERSIOND)
        make gpsbabel doc gpsbabel.html
-       cvs tag -F gpsbabel_$(VERSIONU)
-       cvs export -r gpsbabel_$(VERSIONU) -d gpsbabel-$(VERSIOND) gpsbabel
+       @(. tools/functions && ask "Enter 'y' to tag the tree." "y") && cvs tag -F gpsbabel_$(VERSIONU) ; exit 0
+       cvs export -r gpsbabel_$(VERSIONU) -d /tmp/gpsbabel-$(VERSIOND) gpsbabel
+       touch /tmp/gpsbabel-$(VERSIOND)/internal_styles.c
 
 #
 # Build the release tarball from the exported CVS tree, tweaking 
@@ -176,9 +177,8 @@ release-sourcecheck:
 #
 release-tarball: gpsbabel.html
 #      rm -fr /tmp/gpsbabel-$(VERSIOND)
-       touch /tmp/gpsbabel-$(VERSIOND)/internal_styles.c
        cp -ap gpsbabel.html /tmp/gpsbabel-$(VERSIOND)/
-       tar czf /tmp/gpsbabel-$(VERSIOND).tar.gz gpsbabel-$(VERSIOND)
+       cd /tmp ; tar czf /tmp/gpsbabel-$(VERSIOND).tar.gz gpsbabel-$(VERSIOND)
 #      cd /tmp ; tar xzf gpsbabel-$(VERSIOND).tar.gz
 
 
@@ -220,7 +220,7 @@ msvc-build:
 # under linux: ./configure --target=i386-pc-mingw32 && make mingw32-cross-build
 mingw32-cross-build: 
        make \
-         CC=/usr/local/bin/i386-mingw32-gcc \
+         CC=i386-mingw32-gcc \
          EXEEXT=.exe \
          EXTRA_LDFLAGS="-Lmingw/lib -Imingw/include " 
 

diff --git a/functions b/functions
deleted file mode 100644 (file)
index a0fb093..0000000
--- a/functions
+++ /dev/null
@@ -1,41 +0,0 @@
-function trim_filelist()
-{
-    sort |
-    uniq |                             # remove duplicate lines
-    sed 's/^[ \t]*//;s/[ \t]*$//' |    # remove leading and trailing whitespaces
-    sed '/^$/d'                                # drop empty lines
-}
-
-function check_filelist() # check presence of all files
-{
-    while read f; do 
-       [ -e "$f" ] && continue
-       echo missing: "$f"; exit 1
-    done
-    exit 0
-}
-
-function ask_mrproper()
-{
-    echo ""
-    echo "--------------------------------------------------"
-    echo "!!! WARNING !!! WARNING !!! WARNING !!!WARNING !!!"
-    echo "--------------------------------------------------"
-    echo "All files they are not part of the CVS source tree"
-    echo "    and they not registered in .filelist-devel"
-    echo "                will be killed."
-    echo ""
-    echo -n "Please type yyeess if you are know what you do: "
-    read answer
-    test "$answer" != "yyeess" && exit 1
-    exit 0
-}
-
-function ask() # $1=Question $2=Answer for TRUE
-{
-    echo ""
-    echo -n "$1 : "
-    read answer
-    test "$answer" != "$2" && exit 1
-    exit 0
-}

diff --git a/tools/functions b/tools/functions
new file mode 100755 (executable)
index 0000000..a0fb093
--- /dev/null
+++ b/tools/functions
@@ -0,0 +1,41 @@
+function trim_filelist()
+{
+    sort |
+    uniq |                             # remove duplicate lines
+    sed 's/^[ \t]*//;s/[ \t]*$//' |    # remove leading and trailing whitespaces
+    sed '/^$/d'                                # drop empty lines
+}
+
+function check_filelist() # check presence of all files
+{
+    while read f; do 
+       [ -e "$f" ] && continue
+       echo missing: "$f"; exit 1
+    done
+    exit 0
+}
+
+function ask_mrproper()
+{
+    echo ""
+    echo "--------------------------------------------------"
+    echo "!!! WARNING !!! WARNING !!! WARNING !!!WARNING !!!"
+    echo "--------------------------------------------------"
+    echo "All files they are not part of the CVS source tree"
+    echo "    and they not registered in .filelist-devel"
+    echo "                will be killed."
+    echo ""
+    echo -n "Please type yyeess if you are know what you do: "
+    read answer
+    test "$answer" != "yyeess" && exit 1
+    exit 0
+}
+
+function ask() # $1=Question $2=Answer for TRUE
+{
+    echo ""
+    echo -n "$1 : "
+    read answer
+    test "$answer" != "$2" && exit 1
+    exit 0
+}